Merge
authorStefano Stabellini <sstabellini@xensource.com>
Tue, 22 Jun 2010 15:09:59 +0000 (16:09 +0100)
committerStefano Stabellini <sstabellini@xensource.com>
Tue, 22 Jun 2010 15:09:59 +0000 (16:09 +0100)
commit919dd3858503de47b39989301355331cc90c2acd
treede6998eeadb781bdf63f3bdcd2ffad5dd04aca65
parent8cde53d0997819e503780db7210c7e66d7715c4c
parentc1acfe560ba36ee1df3cb92253e507b4369f9585
Merge